From c0191b781965f41b2c5e6d5be2bc39dfc1b992dc Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Wed, 19 Apr 2017 23:10:57 +0200 Subject: [PATCH] Update clean-cargo-deps for 0.17 --- debian/patches/clean-cargo-deps.patch | 48 ++++++++++----------------- 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/debian/patches/clean-cargo-deps.patch b/debian/patches/clean-cargo-deps.patch index 01d801a28..57dd40a2d 100644 --- a/debian/patches/clean-cargo-deps.patch +++ b/debian/patches/clean-cargo-deps.patch @@ -1,40 +1,30 @@ -Fromm: Luca Bruno -Description: Remove stage1 extra dependencies +From: Luca Bruno +From: Ximin Luo +Description: Remove stage1 extra dependencies (cargo 0.17) Fetching extra dev-dependencies is not yet supported by bootstrap.py and they are not need to build. However, cargo will try to download them before building stage1. + . + For patches for earlier versions of cargo, see the git history for this file. Forwarded: not-needed -Index: cargo/Cargo.toml -=================================================================== ---- cargo.orig/Cargo.toml 2016-11-25 23:14:50.854412390 +0000 -+++ cargo/Cargo.toml 2016-11-25 23:15:24.399062256 +0000 -@@ -17,7 +17,7 @@ - path = "src/cargo/lib.rs" - - [dependencies] +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -47,8 +47,8 @@ + url = "1.1" +-[target.'cfg(windows)'.dependencies] -advapi32-sys = "0.2" -+#advapi32-sys = "0.2" - crates-io = { path = "src/crates-io", version = "0.5" } - crossbeam = "0.2" - curl = "0.4" -@@ -29,7 +29,7 @@ - git2 = "0.6" - git2-curl = "0.7" - glob = "0.2" -kernel32-sys = "0.2" -+#kernel32-sys = "0.2" - libc = "0.2" - libgit2-sys = "0.6" - log = "0.3" -@@ -44,16 +44,16 @@ - term = "0.4.4" - toml = "0.2" - url = "1.1" +-miow = "0.1" +-psapi-sys = "0.1" -winapi = "0.2" ++#[target.'cfg(windows)'.dependencies] ++#advapi32-sys = "0.2" ++#kernel32-sys = "0.2" ++#miow = "0.1" ++#psapi-sys = "0.1" +#winapi = "0.2" - [target.'cfg(unix)'.dependencies] - openssl = "0.9" +@@ -54,7 +54,7 @@ -[dev-dependencies] -hamcrest = "0.1" @@ -47,5 +37,3 @@ Index: cargo/Cargo.toml +#filetime = "0.1" +#cargotest = { path = "tests/cargotest" } - [[bin]] - name = "cargo" -- 2.30.2